subtract TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real

Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract
        TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real
        size for the tree (fixes #72729),
        (gtk_tree_view_real_start_editing): correct cell_area->y for
        scrolling due to gtk_tree_view_real_set_cursor (fixes #75687)

diff --git a/ChangeLog b/ChangeLog
index 10fa712f223c59a773dd50a5cba7ecd2d903f13c..e59fbf8a835f7dce1814c72e5997eb5228d06bde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract
+       TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real
+       size for the tree (fixes #72729),
+       (gtk_tree_view_real_start_editing): correct cell_area->y for
+       scrolling due to gtk_tree_view_real_set_cursor (fixes #75687)
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 10fa712f223c59a773dd50a5cba7ecd2d903f13c..e59fbf8a835f7dce1814c72e5997eb5228d06bde 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract
+       TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real
+       size for the tree (fixes #72729),
+       (gtk_tree_view_real_start_editing): correct cell_area->y for
+       scrolling due to gtk_tree_view_real_set_cursor (fixes #75687)
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 10fa712f223c59a773dd50a5cba7ecd2d903f13c..e59fbf8a835f7dce1814c72e5997eb5228d06bde 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract
+       TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real
+       size for the tree (fixes #72729),
+       (gtk_tree_view_real_start_editing): correct cell_area->y for
+       scrolling due to gtk_tree_view_real_set_cursor (fixes #75687)
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 10fa712f223c59a773dd50a5cba7ecd2d903f13c..e59fbf8a835f7dce1814c72e5997eb5228d06bde 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract
+       TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real
+       size for the tree (fixes #72729),
+       (gtk_tree_view_real_start_editing): correct cell_area->y for
+       scrolling due to gtk_tree_view_real_set_cursor (fixes #75687)
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 10fa712f223c59a773dd50a5cba7ecd2d903f13c..e59fbf8a835f7dce1814c72e5997eb5228d06bde 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract
+       TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real
+       size for the tree (fixes #72729),
+       (gtk_tree_view_real_start_editing): correct cell_area->y for
+       scrolling due to gtk_tree_view_real_set_cursor (fixes #75687)
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 10fa712f223c59a773dd50a5cba7ecd2d903f13c..e59fbf8a835f7dce1814c72e5997eb5228d06bde 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Fri Apr 19 21:06:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): subtract
+       TREE_VIEW_HEADER_HEIGHT from allocation->height to get the real
+       size for the tree (fixes #72729),
+       (gtk_tree_view_real_start_editing): correct cell_area->y for
+       scrolling due to gtk_tree_view_real_set_cursor (fixes #75687)
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f748c78ed6b606ee187b6e3ea4e79b0d4de83046..b22a434bc2e0cec5d9b76a225776475464fe7988 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1650,7 +1650,7 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
   tree_view->priv->vadjustment->lower = 0;
   tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->page_size, tree_view->priv->height);
 
-  if (tree_view->priv->vadjustment->value + allocation->height > tree_view->priv->height)
+  if (tree_view->priv->vadjustment->value + allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view) > tree_view->priv->height)
     gtk_adjustment_set_value (tree_view->priv->vadjustment,
                              MAX (tree_view->priv->height - tree_view->priv->vadjustment->page_size, 0));
   gtk_adjustment_changed (tree_view->priv->vadjustment);
@@ -10647,9 +10647,15 @@ gtk_tree_view_real_start_editing (GtkTreeView       *tree_view,
                                  GdkEvent          *event,
                                  guint              flags)
 {
+  gint pre_val = tree_view->priv->vadjustment->value;
+
   tree_view->priv->edited_column = column;
   _gtk_tree_view_column_start_editing (column, GTK_CELL_EDITABLE (cell_editable));
+
   gtk_tree_view_real_set_cursor (tree_view, path, FALSE, TRUE);
+
+  cell_area->y += pre_val - tree_view->priv->vadjustment->value;
+
   GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
   gtk_tree_view_put (tree_view,
                     GTK_WIDGET (cell_editable),